Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 20:14:28 +0000 (13:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 8 Jul 2011 20:14:28 +0000 (13:14 -0700)
commiteab8bdcb22c95d224cce23ce8fcee349ce803edd
tree7df8216db4d1f82d03969eaf512f056cfdd20167
parent4c8c35072469aecf58bc3c29852dfdb7091b6ec4
parentd0e9258fa0ad0d957674852bb3a16032fe77d32b
Merge from trunk.